* net/tramp.el (tramp-handle-copy-directory): Don't use

`file-remote-p' (due to compatibility).

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f89c32102e27be199aab8f3733ab8fba7351a8c2..7a6da178a6175f0dacaaeffa07bb68065c126bb7 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3404,8 +3404,9 @@ tramp-handle-file-name-all-completions: internal error accessing `%s': `%s'"
               ;; When DIRNAME and NEWNAME are remote, they must have
               ;; the same method.
               (or (null t1) (null t2)
-                  (string-equal (file-remote-p dirname 'method)
-                                (file-remote-p newname 'method))))
+                  (string-equal
+                   (tramp-file-name-method (tramp-dissect-file-name dirname))
+                   (tramp-file-name-method (tramp-dissect-file-name newname)))))
          ;; scp or rsync DTRT.
          (progn
            (setq dirname (directory-file-name (expand-file-name dirname))